auto merge of #583 : alexcrichton/cargo/local-cargo, r=brson
authorbors <bors@rust-lang.org>
Wed, 17 Sep 2014 03:39:40 +0000 (03:39 +0000)
committerbors <bors@rust-lang.org>
Wed, 17 Sep 2014 03:39:40 +0000 (03:39 +0000)

Trivial merge